From 9f8aebe26c057b4f42488905c5d97693e255d1f1 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 13 Jan 2012 08:34:57 +0100
Subject: [PATCH] remove inclusion of asm/config.h

This was always bogus (xen/config.h should have been used instead) and
is superfluous now that xen/config.h gets included through the compiler
command line.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
---
 xen/arch/ia64/vmx/optvfault.S                | 2 --
 xen/arch/ia64/xen/cpufreq/cpufreq.c          | 1 -
 xen/arch/ia64/xen/ivt.S                      | 3 ---
 xen/arch/x86/acpi/cpufreq/cpufreq.c          | 1 -
 xen/arch/x86/acpi/cpufreq/powernow.c         | 1 -
 xen/drivers/cpufreq/cpufreq.c                | 1 -
 xen/drivers/cpufreq/cpufreq_ondemand.c       | 1 -
 xen/drivers/cpufreq/utility.c                | 1 -
 xen/include/asm-ia64/linux-xen/asm/perfmon.h | 1 -
 xen/include/asm-ia64/privop_stat.h           | 2 +-
 xen/include/asm-ia64/xensystem.h             | 1 -
 xen/include/asm-x86/hvm/svm/nestedsvm.h      | 1 -
 xen/include/asm-x86/hvm/vmx/vmcs.h           | 1 -
 13 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/xen/arch/ia64/vmx/optvfault.S b/xen/arch/ia64/vmx/optvfault.S
index 62bfb62a34..896ea31be9 100644
--- a/xen/arch/ia64/vmx/optvfault.S
+++ b/xen/arch/ia64/vmx/optvfault.S
@@ -6,8 +6,6 @@
  * Xuefei Xu (Anthony Xu) <anthony.xu@intel.com>
  */
 
-#include <linux/config.h>
-#include <asm/config.h>
 #include <asm/pgtable.h>
 #include <asm/asmmacro.h>
 #include <asm/kregs.h>
diff --git a/xen/arch/ia64/xen/cpufreq/cpufreq.c b/xen/arch/ia64/xen/cpufreq/cpufreq.c
index b365e61d94..fac89013b6 100644
--- a/xen/arch/ia64/xen/cpufreq/cpufreq.c
+++ b/xen/arch/ia64/xen/cpufreq/cpufreq.c
@@ -21,7 +21,6 @@
 #include <xen/xmalloc.h>
 #include <asm/bug.h>
 #include <asm/io.h>
-#include <asm/config.h>
 #include <asm/processor.h>
 #include <asm/percpu.h>
 #include <asm/pal.h>
diff --git a/xen/arch/ia64/xen/ivt.S b/xen/arch/ia64/xen/ivt.S
index 682c846984..e6feb539ad 100644
--- a/xen/arch/ia64/xen/ivt.S
+++ b/xen/arch/ia64/xen/ivt.S
@@ -1,7 +1,6 @@
 #include <asm/debugger.h>
 #include <asm/vhpt.h>
 #include <public/arch-ia64.h>
-#include <asm/config.h>
 /*
  * arch/ia64/kernel/ivt.S
  *
@@ -43,8 +42,6 @@
  * Table is based upon EAS2.6 (Oct 1999)
  */
 
-#include <linux/config.h>
-
 #include <asm/asmmacro.h>
 #include <asm/break.h>
 #include <asm/ia32.h>
diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c
index b868f164ff..ff80c9de30 100644
--- a/xen/arch/x86/acpi/cpufreq/cpufreq.c
+++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c
@@ -38,7 +38,6 @@
 #include <asm/bug.h>
 #include <asm/msr.h>
 #include <asm/io.h>
-#include <asm/config.h>
 #include <asm/processor.h>
 #include <asm/percpu.h>
 #include <asm/cpufeature.h>
diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c
index fb174fa771..69d7f94a1e 100644
--- a/xen/arch/x86/acpi/cpufreq/powernow.c
+++ b/xen/arch/x86/acpi/cpufreq/powernow.c
@@ -32,7 +32,6 @@
 #include <asm/bug.h>
 #include <asm/msr.h>
 #include <asm/io.h>
-#include <asm/config.h>
 #include <asm/processor.h>
 #include <asm/percpu.h>
 #include <asm/cpufeature.h>
diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c
index f49ea1c9c2..c0b0f88a09 100644
--- a/xen/drivers/cpufreq/cpufreq.c
+++ b/xen/drivers/cpufreq/cpufreq.c
@@ -41,7 +41,6 @@
 #include <xen/cpu.h>
 #include <asm/bug.h>
 #include <asm/io.h>
-#include <asm/config.h>
 #include <asm/processor.h>
 #include <asm/percpu.h>
 #include <acpi/acpi.h>
diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c
index c9378adc4f..b3f9ab89e6 100644
--- a/xen/drivers/cpufreq/cpufreq_ondemand.c
+++ b/xen/drivers/cpufreq/cpufreq_ondemand.c
@@ -18,7 +18,6 @@
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/timer.h>
-#include <asm/config.h>
 #include <acpi/cpufreq/cpufreq.h>
 
 #define DEF_FREQUENCY_UP_THRESHOLD              (80)
diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c
index 3edcfcc18f..fad54651b3 100644
--- a/xen/drivers/cpufreq/utility.c
+++ b/xen/drivers/cpufreq/utility.c
@@ -28,7 +28,6 @@
 #include <xen/sched.h>
 #include <xen/timer.h>
 #include <xen/trace.h>
-#include <asm/config.h>
 #include <acpi/cpufreq/cpufreq.h>
 #include <public/sysctl.h>
 
diff --git a/xen/include/asm-ia64/linux-xen/asm/perfmon.h b/xen/include/asm-ia64/linux-xen/asm/perfmon.h
index 23dec44bc3..af189b05cb 100644
--- a/xen/include/asm-ia64/linux-xen/asm/perfmon.h
+++ b/xen/include/asm-ia64/linux-xen/asm/perfmon.h
@@ -7,7 +7,6 @@
 #define _ASM_IA64_PERFMON_H
 
 #ifdef XEN
-#include <asm/config.h>
 #ifndef pt_regs
 #define pt_regs cpu_user_regs
 #endif
diff --git a/xen/include/asm-ia64/privop_stat.h b/xen/include/asm-ia64/privop_stat.h
index d80ec4b778..326b56d278 100644
--- a/xen/include/asm-ia64/privop_stat.h
+++ b/xen/include/asm-ia64/privop_stat.h
@@ -1,6 +1,6 @@
 #ifndef _XEN_IA64_PRIVOP_STAT_H
 #define _XEN_IA64_PRIVOP_STAT_H
-#include <asm/config.h>
+
 #include <xen/types.h>
 #include <public/xen.h>
 
diff --git a/xen/include/asm-ia64/xensystem.h b/xen/include/asm-ia64/xensystem.h
index 3e49f8ae63..1fa0456bd5 100644
--- a/xen/include/asm-ia64/xensystem.h
+++ b/xen/include/asm-ia64/xensystem.h
@@ -10,7 +10,6 @@
  * 	Kun Tian (Kevin Tian) <kevin.tian@intel.com>
  *
  */
-#include <asm/config.h>
 
 /* Define HV space hierarchy.
    VMM memory space is protected by CPL for paravirtualized domains and
diff --git a/xen/include/asm-x86/hvm/svm/nestedsvm.h b/xen/include/asm-x86/hvm/svm/nestedsvm.h
index 65c13211a2..f6951b3230 100644
--- a/xen/include/asm-x86/hvm/svm/nestedsvm.h
+++ b/xen/include/asm-x86/hvm/svm/nestedsvm.h
@@ -19,7 +19,6 @@
 #ifndef __ASM_X86_HVM_SVM_NESTEDSVM_H__
 #define __ASM_X86_HVM_SVM_NESTEDSVM_H__
 
-#include <asm/config.h>
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/svm/vmcb.h>
 
diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h
index 6d58c37ba9..610061923c 100644
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -19,7 +19,6 @@
 #ifndef __ASM_X86_HVM_VMX_VMCS_H__
 #define __ASM_X86_HVM_VMX_VMCS_H__
 
-#include <asm/config.h>
 #include <asm/hvm/io.h>
 #include <asm/hvm/vpmu.h>
 
-- 
2.30.2